Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 9 Nov 2011 18:45:49 +0000 (10:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 9 Nov 2011 18:45:49 +0000 (10:45 -0800)

Trivial merge